status/remoteAccess: Port to click gestures

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3912>

diff --git a/js/ui/status/remoteAccess.js b/js/ui/status/remoteAccess.js
index b7b70661efffda87c5088968822b51c95a9ed1cc..99d7f94838ad4ea5c2f045f5b469802541a8d5cf 100644 (file)
--- a/js/ui/status/remoteAccess.js
+++ b/js/ui/status/remoteAccess.js
@@ -92,14 +92,12 @@ export const ScreenRecordingIndicator = GObject.registerClass({
         Main.screenshotUI.connect(
             'notify::screencast-in-progress',
             this._onScreencastInProgressChanged.bind(this));
-    }
-
-    vfunc_event(event) {
-        if (event.type() === Clutter.EventType.TOUCH_BEGIN ||
-            event.type() === Clutter.EventType.BUTTON_PRESS)
-            Main.screenshotUI.stopScreencast();
 
-        return Clutter.EVENT_PROPAGATE;
+        this._clickGesture = new Clutter.ClickGesture();
+        this._clickGesture.set_recognize_on_press(true);
+        this._clickGesture.connect(
+            'recognize', () => Main.screenshotUI.stopScreencast());
+        this.add_action(this._clickGesture);
     }
 
     _updateLabel() {
@@ -163,6 +161,11 @@ export const ScreenSharingIndicator = GObject.registerClass({
             (o, handle) => this._onNewHandle(handle));
 
         this._sync();
+
+        this._clickGesture = new Clutter.ClickGesture();
+        this._clickGesture.set_recognize_on_press(true);
+        this._clickGesture.connect('recognize', () => this._stopSharing());
+        this.add_action(this._clickGesture);
     }
 
     _onNewHandle(handle) {
@@ -184,14 +187,6 @@ export const ScreenSharingIndicator = GObject.registerClass({
         this._sync();
     }
 
-    vfunc_event(event) {
-        if (event.type() === Clutter.EventType.TOUCH_BEGIN ||
-            event.type() === Clutter.EventType.BUTTON_PRESS)
-            this._stopSharing();
-
-        return Clutter.EVENT_PROPAGATE;
-    }
-
     _stopSharing() {
         for (const handle of this._handles)
             handle.stop();